Merge "Always use the LocalePicker's preferred locale names." into lmp-dev