am 755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1

* commit '755a967bdc2cddb6fbadd10e357f8a5328520061':
  Clean up wifi/mobile indicators in the expanded panel.