Merge "camera: Let SurfaceView transform preview only when rotation override isn't rotation only" into main