Merge changes Ib7ce422d,I977e7750 into sc-dev am: 119b7a6a12

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

Change-Id: Ibac9958e6e3340d86c9262624be18a25e1cc77e1