am 886a1400: am b6f567db: Merge "Show data icon when appropriate." into mnc-dev

* commit '886a1400bf1f0f49eebaf8208603c0f6d6f939b1':
  Show data icon when appropriate.