Merge changes I6cf84ec7,Iea599651,If3238286 into sc-v2-dev am: b5a051ca0b

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

Change-Id: Iffb14ab9d043a5802a92a76b2f388a62423c6625