Merge "Make sure MainContentCaptureSession's control behaviour is not changed" into main