Merge "Fixed data icon disappeared issue" into sc-v2-dev