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

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

Change-Id: Ie4b54c70e6de12ffd3a7d831773d4e3ccb3d4353