Merge "[Locale Preference] Seperate region and numbering system." into udc-dev