Merge changes Ice83b544,If0bc2a6d into sc-dev am: 30ffc3f95c

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

Change-Id: Ieae1b982fc67db8c81e35fba07ac56dea0d0343f