Merge "Fix icon adding issue on two panel home" into sc-v2-dev