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

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

Change-Id: I5b3d7943f58aa4858cb592c9335e1ec54eab3691