Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit

src/com/android/launcher3/Folder.java

@@ -773,7 +773,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
                 }
                 completeDragExit();
             }
-        } else {
+        }
+
+        // This is kind of hacky, but in general, dropping on the workspace handles removing
+        // the extra screen, but dropping elsewhere (back to self, or onto delete) doesn't.
+        if (target != mLauncher.getWorkspace()) {
             mLauncher.getWorkspace().removeExtraEmptyScreen(true, null);
         }