Settings: add cm_strings.xml & cm_arrays.xml for cherry-picks