Merge "Make status bar indicators reflect the network actually in use." into lmp-dev