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

                }

                }

                completeDragExit();

                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);

            mLauncher.getWorkspace().removeExtraEmptyScreen(true, null);

        }

        }