Merge "Decouple direct dependency on MainContentCaptureSession" into main