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

Conflicts:
	src/com/android/settings/cyanogenmod/ButtonSettings.java

Change-Id: Idc77ba900c14e62117f8506afa47e1bdfc0685a7
Revert "[TEMP] Revert "Active notifications:""

it's back and as funny smelling as ever.

This reverts commit 00eb4c07da81a57b7d49ce6c215aaa8f4c985d80.

Change-Id: Ia7142dff6864b3289869f23cfde5de5b1c619fad
Fix immersive mode entries

in a way that doesn't make my eyes barf when I look at it.

Change-Id: I76086965908db895d82ddbcf7b42b2241aedd908
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Change-Id: I4f3dd81f0cbee35c13292a8f946acf9091145dee
Make the Voice+ setup under WirelessSettings cognizant of installation status of Voice+

Change-Id: I07e53888256a1a314baeab7c8f6570306246fc91