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

Conflicts:
	res/xml/quick_settings_panel.xml
	src/com/android/settings/quicksettings/QuickSettings.java