Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1

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

Change-Id: I695053553d122e0eb0bae1f569d0b747dd612c8a