Merge "Fix icon adding issue on two panel home" into sc-v2-dev am: a2f5ee8f0c am: 27476dcf3f

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

Change-Id: Id821b459555e42ad0bdae3876be060b2e3798291