Merge commit 'refs/changes/72/3572/4' of https://gerrit.slimroms.net/SlimRoms/packages_apps_Settings into kk4.4

Conflicts:
	res/values/slim_arrays.xml

Conflicts:
	res/values/slim_strings.xml