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

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

Change-Id: Ib5cdc82f2747a6c1beaf86d86139bf7585798713