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: Ia47243fc63bc42d852b2323efbf1db9c3e91cedb