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

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

Change-Id: I8ffef04a292fa9fab9ba3acdd09fb38f975a0b02