Merge "Changes on the ContentCaptureContext APIs."