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

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

Change-Id: Ib20a5bd4d13a4f8d48d8520c7f550b26ff23bcd2