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

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

Change-Id: I2290caeee3604ae79d995607694226c2a9b92acb