Merge "Remove data icon for WFC" into mnc-dev