Merge "Cleanup deferred drag when closing deep shortcuts container." into ub-launcher3-calgary

src/com/android/launcher3/Launcher.java

@@ -3132,6 +3132,7 @@ public class Launcher extends Activity
     public void closeShortcutsContainer() {
         DeepShortcutsContainer deepShortcutsContainer = getOpenShortcutsContainer();
         if (deepShortcutsContainer != null) {
+            deepShortcutsContainer.cleanupDeferredDrag(true);
             mDragController.removeDragListener(deepShortcutsContainer);
             mDragLayer.removeView(deepShortcutsContainer);
         }