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: I8f84944ffa0f9a4ab66473202dbfe75815bcd117