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

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

Change-Id: I3ef3b561f2c76e5e4c069af751477ae83e11fcb7