Merge "Improve notification shade collapse code." into cm-10.1
Conflicts:
	packages/SystemUI/src/com/android/systemui/SwipeHelper.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/IntruderAlertView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java

Change-Id: I879e2e0367ec56a160119bfde9b817d6539a9369
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