Merge "Refine performance for calling into ContentCapture" into rvc-dev