Merge "FW_Base - Extend SwipeHelper" into kk

Conflicts:
	core/java/android/provider/Settings.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/policy/NotificationRowLayout.java
	services/java/com/android/server/connectivity/Tethering.java

Change-Id: Idcef2d549b80a148d1ce1b788c90a9b950b89871
 Merge "FW_Base - Swipe to Float for notifications and recents [1/2]" …

…into kk
WIFI: Fix wimax teardown when wifi connected

Due to patch:
https://github.com/CyanogenMod/android_frameworks_base/commit/f769f4cbc2aaac8d9d49f9ff79a6fe0affc4ff6e

Change-Id: I18e5ced62c8e4976f7a6835ba8c593930dac0586
Merge "WIFI: Fix wimax teardown when wifi connected" into kk
Revert "SystemUI: Fix missing top task in recent panel."

See http://review.cyanogenmod.org/#/c/74397/

This reverts commit 0616667d980db1aa32d6dd1956d6fc2e232cf5a3.

Change-Id: I3276ee4f77e3de5d5b758f3bfb09fdc2341ebb5b