Merge "Resolve difference between master and rvc-dev." into rvc-dev am: dea08002fa am: b7b93fbec5

Change-Id: I53038c7cd695591edcd06e52d3f588493cf8b9e5

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

@@ -1386,13 +1386,14 @@ public class BubbleStackView extends FrameLayout {
         if (DEBUG_BUBBLE_STACK_VIEW) {
             Log.d(TAG, "onBubbleDragStart: bubble=" + bubble);
         }
-        maybeShowManageEducation(false);
         mExpandedAnimationController.prepareForBubbleDrag(bubble, mMagneticTarget);
 
         // We're dragging an individual bubble, so set the magnetized object to the magnetized
         // bubble.
         mMagnetizedObject = mExpandedAnimationController.getMagnetizedBubbleDraggingOut();
         mMagnetizedObject.setMagnetListener(mIndividualBubbleMagnetListener);
+
+        maybeShowManageEducation(false);
     }
 
     /** Called with the coordinates to which an individual bubble has been dragged. */