Merge "Add data disabled icon"