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

Conflicts:
	src/com/android/settings/cyanogenmod/StatusBar.java
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

Change-Id: Ie927dd5f8a83806ecacb5a3dca0f356974f6763e