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

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

Change-Id: I6e97086358b20240c05ce06d3f2b600d9e139263