Merge "Clear bubble bar saved states if bubble bar controllers not present." into main

quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java

@@ -177,7 +177,8 @@ public class TaskbarControllers {
         taskbarOverlayController.init(this);
         taskbarAllAppsController.init(this, sharedState.allAppsVisible);
         navButtonController.init(this);
-        bubbleControllers.ifPresent(controllers -> controllers.init(sharedState, this));
+        bubbleControllers.ifPresentOrElse(controllers -> controllers.init(sharedState, this),
+                sharedState::clearBubbleData);
         taskbarInsetsController.init(this);
         voiceInteractionWindowController.init(this);
         taskbarRecentAppsController.init(this, sharedState.recentTasksBeforeTaskbarRecreate);

quickstep/src/com/android/launcher3/taskbar/TaskbarSharedState.java

@@ -94,6 +94,16 @@ public class TaskbarSharedState {
         return bubbleInfoItems != null && !bubbleInfoItems.isEmpty();
     }
 
+    /** Clears stored bubble bar data. */
+    public void clearBubbleData() {
+        bubbleInfoItems = null;
+        selectedBubbleKey = null;
+        bubbleBarLocation = null;
+        bubbleBarExpanded = false;
+        bubbleBarStashed = false;
+        suppressedBubbleInfoItems = null;
+    }
+
     // LauncherTaskbarUIController#mTaskbarInAppDisplayProgressMultiProp
     public float[] inAppDisplayProgressMultiPropValues = new float[DISPLAY_PROGRESS_COUNT];