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

PS: THIS MERGE REMOVE THIS COMMIT: CyanogenMod/android_packages_apps_Settings@6445c9c
    crDroid already have this for a long time ago

Conflicts:
	res/xml/status_bar.xml

Change-Id: Id626ab213a443b66042d34ae913adfd09809805e