resolve merge conflicts of 107fe60f6e to ub-launcher3-master

Change-Id: I9a1c52e66edd627fd54cc3cb423fa28a6175f8ac

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java

@@ -165,6 +165,11 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
 
         mMotionPauseDetector.clear();
         mNormalToHintOverviewScrimAnimator = null;
+        if (mLauncher.isInState(OVERVIEW)) {
+            // Normally we would cleanup the state based on mCurrentAnimation, but since we stop
+            // using that when we pause to go to Overview, we need to clean up ourselves.
+            clearState();
+        }
     }
 
     @Override