[automerge] Close open folders when pausing launcher. 2p: 253c23b2e8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17546438

Bug: 227142635
Change-Id: I576710869215ec19a60fe29371b742f881260702

src/com/android/launcher3/Launcher.java

@@ -1183,6 +1183,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             mOverlayManager.onActivityResumed(this);
         }
 
+        AbstractFloatingView.closeOpenViews(this, false, TYPE_ALL & ~TYPE_REBIND_SAFE);
         TraceHelper.INSTANCE.endSection(traceToken);
     }
 
@@ -1686,9 +1687,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             outState.remove(RUNTIME_STATE_WIDGET_PANEL);
         }
 
-        // We close any open folders and shortcut containers that are not safe for rebind,
-        // and we need to make sure this state is reflected.
-        AbstractFloatingView.closeOpenViews(this, false, TYPE_ALL & ~TYPE_REBIND_SAFE);
         finishAutoCancelActionMode();
 
         if (mPendingRequestArgs != null) {