Merge changes I097134c4,Icfe39c30 into sc-v2-dev am: 8469dc98c6

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

Change-Id: I8aa87b6dda2b8ceafc6e5719e938640dd72432ea