Merge changes Id2a8d12e,I06353ba4 into sc-dev am: 6788b73970 am: c167b0bdf3 am: c499e1eb0b

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

Change-Id: If1c3c1b345ef0c66ae1a2fc78be7c3366ba2b1a1