Merge "Make notification-shade-collapse-after-dismiss behaviour configurable." into cm-10.1
Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

Change-Id: I55056cb1d4d9c7be3e265ff0c3db2e545e700b71