Merge changes I36871463,I691a5cbb,I62105c1c into sc-v2-dev am: 49da26f636 am: e60d5d4f6d

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

Change-Id: I45da18a185b6d4aca7a2f0c5248ea3749adfd47c