Fixes to locale section (#13220), replaced Select with ComboBox (#13234).

Change-Id: Id09fbd3f9f4fa6587ecdbfccc2ef93cd2bbc95e6