Merge "Revert "PSS opt-out override: move logic to MediaProjectionManager"" into main