Merge changes Id2a8d12e,I06353ba4 into sc-dev am: 6788b73970 am: b8de52725e

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

Change-Id: I03b4acde4c095f6b47f6f1eeee34417f86b0d7a7