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

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

Change-Id: I7f2840229a8ff5bad5c9acaa143b5e6c139c1689