Merge "Fixed NPE on MainContentCaptureSession.handleFlushIfNeeded"