Merge "Two panel home empty page removing logic change" into sc-v2-dev