Merge "Fixed how ContentCapture is kill-switched."