Merge changes I6bf48141,I77b7a2e4 into sc-v2-dev am: f262591ab0 am: 9a9a93f551

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

Change-Id: I6b222c6875a8916d7d198c85f4e998dc31fb8873