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

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

Change-Id: I6251cd20346c098bbedc37d04ff2ca6b1b6e0ae1