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

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

Change-Id: Ieffe91ab6de4859bbfe9beef2690cdcd201e7011