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

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

Change-Id: I631f290d0df10f42f633c489bdb4043bd6c400d8