Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java

Change-Id: I793a0187462178642477622c4519da5deb60562b