Merge "Add new ContentCapture APIs to let apps change the ContentCaptureContext."