Merge "Fix add extra empty screen logic" into sc-dev am: a45ea6cf33 am: 6ed0112871 am: 039c4a774f

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

Change-Id: Ice707931039f1c20b105fd32d159096598c8c970