Merge "Settings: Move strings to cm_strings.xml or cm_arrays.xml" into cm-11.0