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

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

Change-Id: I1016f3d2b448a66a85ed360ae2a6a2b5011b9ebb