Merge changes Id9fdcd71,Ic4d69d73 into sc-v2-dev am: b4ce5c1b36 am: 9b884ee9b9

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

Change-Id: I4d9bdd14b8f30a3b869d6b07b8e44d776ccb67f0