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

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

Change-Id: I89708a6f20edb8b7b48379c9e482753f22970f6e