Merge "Merge Autofill settings into Account settings." into sc-dev