Merge "Revert "CameraServiceProxy: Clean up app compat overrides"" into sc-v2-dev