Do not defer removing the drag view if we don't animate the item back into the folder. (Bug 6249514)

Change-Id: I40c47d9320158ec5ba4b4663316ecee488a61876
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 36913ca..e8f1ac9 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -978,6 +978,7 @@
             if (d.dragView.hasDrawn()) {
                 mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, mCurrentDragView);
             } else {
+                d.deferDragViewCleanupPostAnimation = false;
                 mCurrentDragView.setVisibility(VISIBLE);
             }
             mItemsInvalidated = true;