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

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

Change-Id: Ie3f8cc62eda1b300a9d099441be6f2830b54208f