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: I6280a0eca86273230ef6a8b608d7024f6d373601