Merge "Remove gap between screenIds when restoring from single display device" into sc-v2-dev am: 048a8246fa am: 3789aa1c86

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

Change-Id: Ib496f264cba523f480eaf7bbd6463b57ed36a9e3