Merge "Make notification-shade-collapse-after-dismiss behaviour configurable." into cm-10.1
Conflicts:
	res/values-pt/cm_strings.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/notification_drawer.xml
	src/com/android/settings/cyanogenmod/NotificationDrawer.java
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: I6e749f43bdce8cda130c961b78b0fb8970d91dcb