Merge "Remove Numbering System preference if no corresponding locale." into udc-dev