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

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

Change-Id: Ibc2929fe39db48a541b22a01b5a0906ade450d33