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

src/com/android/launcher2/Folder.java

@@ -978,6 +978,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             if (d.dragView.hasDrawn()) {
                 mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, mCurrentDragView);
             } else {
+                d.deferDragViewCleanupPostAnimation = false;
                 mCurrentDragView.setVisibility(VISIBLE);
             }
             mItemsInvalidated = true;