Merge changes Id9fdcd71,Ic4d69d73 into sc-v2-dev am: b4ce5c1b36

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

Change-Id: I4590c92f09e61e1cd4a8d199e15b5fdc580668f9