Merge "Fix the context leak in the ContentCapture" into rvc-dev