Merge "RRO: prevent duplicate system overlays"