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: I49ebbfb13c1ab1fa96daa1d1a5f313f7b5c3b49f