am a5250ad3: am 422a7208: am 4b0badc9: am 3a14eeb5: Bit of code cleanup (issue 11648206)

* commit 'a5250ad3e4429c357471d19defa1ad6e424225f9':
  Bit of code cleanup (issue 11648206)

src/com/android/launcher3/Workspace.java

@@ -708,7 +708,12 @@ public class Workspace extends SmoothPagedView
                         onComplete, stripEmptyScreens);
             }
             return;
+        } else if (stripEmptyScreens) {
+            // If we're not going to strip the empty screens after removing
+            // the extra empty screen, do it right away.
+            stripEmptyScreens();
         }
+
         if (onComplete != null) {
             onComplete.run();
         }