Merge changes Ib7d3a07e,Ic22ccf17 into sc-dev am: b009faca5e am: 4cbe0ec253 am: f48968aad3

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

Change-Id: I99351b26bffcab82a205130e9f20a94db3cda8c0