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

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

Change-Id: Ib18d6c070199ec49afb96a69c5dac299f030e20f