Merge remote-tracking branch 'slim/kk4.4' into kk44s-test

Conflicts:
	res/values-de/slim_strings.xml
	res/values-fr/slim_strings.xml
	res/values-it/slim_strings.xml
	res/values-pl/slim_strings.xml
	res/values/slim_strings.xml
	res/xml/heads_up_settings.xml
	src/com/android/settings/slim/HeadsUp.java