resolve merge conflicts of f17eb616a8 to ub-launcher3-qt-r1-dev

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4e177dfb7ba3bde6eb53f63c2f2df273feef90ee

src/com/android/launcher3/LauncherState.java

@@ -258,9 +258,6 @@ public class LauncherState {
      * Called when the start transition ends and the user settles on this particular state.
      */
     public void onStateTransitionEnd(Launcher launcher) {
-        if (this == NORMAL || this == SPRING_LOADED) {
-            UiFactory.resetOverview(launcher);
-        }
         if (this == NORMAL) {
             // Clear any rotation locks when going to normal state
             launcher.getRotationHelper().setCurrentStateRequest(REQUEST_NONE);