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

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: Ibf5ea223431f18cbc85f5cce820fbc0eb5e73150