Merge changes I69baed7b,I38a1da16 into sc-dev am: ce9134c982 am: a0e4d043a1

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

Change-Id: I23ae34a3e8a910e3646078c7fa888b767bd573e4