Comment 5 for bug 1391940

I suggest that the Wi-Fi toggle, label and all, should be a component that is used by the Wi-Fi screen, the Battery screen, and the network indicator. That would have avoided this bug, and a similar future bug when hotspot is implemented. (Specifically, the label should change from "Wi-Fi" to "Wi-Fi used for Hotspot" when it's on; if the item is implemented three places, the odds of all three behaving identically are low.)