Merge "Fixed ContentCapture and AugmentedAutofill methods that should not hold the main lock..."