Re-add lockscreen music controls setting.

Change-Id: If137978d5c0fa197e75707fd6fe7b09c850de454
Fix app selection when adding apps to app groups.

- Don't drop separate apps with the same title
- Sort case-insensitive
- Sort disabled apps to the end of the list

Change-Id: Iffadca4896468aaee5fcfd60f8776c2bb1a8ce7f
Reenable split action bar for profile settings.

Change-Id: I5af3f0fd7cafaab6f2d9152df943658170fc58ce
Sort disabled apps to the end of the list in privacy guard manager.

JIRA: CYAN-1707
Change-Id: Ie3c1cf0339d66405d27c06dba07cc80e4001d669
Merge "Re-add lockscreen music controls setting." into cm-10.2
Merge "Reenable split action bar for profile settings." into cm-10.2
Merge "Fix app selection when adding apps to app groups." into cm-10.2
Merge "Sort disabled apps to the end of the list in privacy guard manager." into cm-10.2
Make notification-shade-collapse-after-dismiss behaviour configurable.

Change-Id: Icbf706a582279b86d901fb727b58663713606521
Settings: Tweak strings for notification drawer auto close

Change-Id: I5aa8c8a6876aad59cf578d31edfa8a099d2dbd97
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	res/values/cm_arrays.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: Ie511fa21f1ac7717b48875cacb11ca5502638ee7