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

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

Change-Id: I1a1e76af5f60c72d2a69ae014b0787766425f6cb