Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1 am: 18d07beef4 am: 001543fdce

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

Change-Id: I86b96b495c3fee30bebc37a3f62f4d6b34d5895d