Merge "Enabled Content Capture in Service" into rvc-dev