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

Conflicts:
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java