Merge changes I9749124a,Ic59b877c,Ibe8734e8 into sc-dev am: 1282050f2f

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

Change-Id: If2cd0304bb0677cb8b03070fc2e882ae11dc2aba