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