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

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

Change-Id: I40b331817125cd8f4f56302d004bb77e79ca635b