Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev