Merge changes I499c59bd,Ia7260c60,I90846e65 into sc-v2-dev am: 4e9a3d5bdf

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

Change-Id: Ib26957e30803ea5a10ac182f4c182b480fe388ce