Merge "Show data icon when appropriate." into mnc-dev