Re-add lockscreen music controls setting.

Change-Id: If137978d5c0fa197e75707fd6fe7b09c850de454

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Carbon battery [2/2]

Signed-off-by: Andros Rosa <andros2011@gmail.com>

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml

Change-Id: Ic7f94e9df5342c43d3f5dfd2c9fb2d25d7382c8e
Make notification-shade-collapse-after-dismiss behaviour configurable.

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

Change-Id: I5aa8c8a6876aad59cf578d31edfa8a099d2dbd97

Conflicts:
	res/values/cm_strings.xml
Fix Build