Merge remote-tracking branch 'slim/kk4.4-caf' into ose

Conflicts:
	packages/SystemUI/res/values-hu/ose_strings.xml
	packages/SystemUI/res/values/ose_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java