Merge changes I46501369,Icd1ddd43 into sc-dev am: 2c2163329b am: 1b90069c45 am: a1a0f41b21

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

Change-Id: Id884912cc5d0bb060b4e1b0e53ed5a75f80495fc