Merge branch 'kk4.4' of https://github.com/SlimRoms/packages_apps_Settings into kk4.4

Conflicts:
	res/values/slim_arrays.xml

Change-Id: I8c2196ce2ecb1fcbc8bea9a5c1347dea4acde5b4