Merge "Fix two panel home folder opening display issue" into sc-dev