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