Merge changes Ib7d3a07e,Ic22ccf17 into sc-dev am: b009faca5e

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

Change-Id: I57ed6fcb6de86234454b299f68b9911c9afe84ff