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

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

Change-Id: Ib97706e0a8dcb70259876da8af5a6b71ae579735