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

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

Change-Id: If206a483cba086819d4834c98b285110dac0f0c5