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

Conflicts:
	src/com/android/settings/ose/quicksettings/QuickSettingsTiles.java