Merge "Improved how content capture is disabled by settings."