Merge "Fix ContentCaptureManagerTest test fail." into rvc-dev