Merge "Autofill compat - Settings"