Merge changes Ibc81d80b,I51d99207 into sc-v2-dev am: 89d3f7d12a am: 5df63f61b5

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

Change-Id: I6bd2bfdca1e8885783ec80bd16d9417a76b8b05d