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

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

Change-Id: I9a2e385d4b95c26ba7b8e0955d5ee16fb20fa9db