Merge "Update icon and text size for two panel home screen" into sc-dev