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

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

Change-Id: Ib5b1b4daf48f67e90a24b7b93889198a529e119f