Merge "Allow apps with shared system uid to change overlays"