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

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

Change-Id: I8accc7c6fe020b2e8ba299cd1f4a57160b8a96d5