Merge "WifiManager: add iface name and mode labels"