Merge "[Settings] Refactor: deprecate LocalePickerWithRegion and add a new interface for LocaleCollector" into main