Merge changes I7b9e6e7f,I9729cd40 into sc-dev am: 51b35256d2 am: ae054d8584

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

Change-Id: I775c0edcfe403c854a7c87104fa9aba78761f18d