Settings: Minor values cleanup

Change-Id: If26d98b947b36bea19715f644e3e6308c0581121

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml