Merge "Fix repeated empty workspaces after changing the grid size." into tm-qpr-dev am: 1f7b2f9a7a am: ec7229e94b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18470799

Change-Id: If60cb3b2c0de474134356dc768c8e65d2c250735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5be63e3..447745e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2750,6 +2750,8 @@
         getViewCache().setCacheSize(R.layout.folder_page, 2);
 
         TraceHelper.INSTANCE.endSection(traceToken);
+
+        mWorkspace.removeExtraEmptyScreen(true);
     }
 
     private boolean canAnimatePageChange() {