Merge "Apply footer icon for Smart Storage" into sc-dev