Merge "Fix add extra empty screen logic" into sc-dev am: a45ea6cf33 am: f573435d2c

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

Change-Id: I23571c1c8bfa27bb1d7290e5529526cf9ffcbc03