Merge "Cosmetic ContentCapture fixes."