Merge "Fix wrong screenId when committing emptyScreens" into sc-v2-dev am: b94401646d

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

Change-Id: I922d7c34a4e031f72b5ed8b1a4a31d16a7c8f065