am f4e12b81: am 5710ec48: Merge "Make status bar indicators reflect the network actually in use." into lmp-dev

* commit 'f4e12b81884776f35a91ef572e25376891fd6848':
  Make status bar indicators reflect the network actually in use.