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: I2ad1c6fd6c70d06f3aea57b465cddb107f4aba2e