Merge changes I675dbe99,Ia6daa741 into sc-v2-dev am: 139dee45dd am: 8bc27a7ee2

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

Change-Id: I412985630ce32cd2f544db3b5b50885405983afb