Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release

src/com/android/launcher3/AppsCustomizePagedView.java

@@ -828,7 +828,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
                 }
             });
         } else {
-            mLauncher.getWorkspace().removeExtraEmptyScreen(true, null);
             mLauncher.unlockScreenOrientation(false);
         }
     }