Merge changes I3e7d3c61,I1cba811c into sc-v2-dev am: f4f6c0fd4f am: 8cb3df4896

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

Change-Id: Ida8739d4e792f82ce9c64772756d1e21f4449df9