Merge "Fix number localization in the strings.xml" into sc-dev