Make notification-shade-collapse-after-dismiss behaviour configurable.

Change-Id: Icbf706a582279b86d901fb727b58663713606521
Merge "Make notification-shade-collapse-after-dismiss behaviour configurable." into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1

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