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: Iac5cf13936f3a7965455d65cfbf7019709d5ec6c