Merge "Fixed data icon disappeared issue"