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

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

Change-Id: I7dd368b3289795396bcc967e3650abfb64e40390