Merge "Do not display <unknown ssid>." into pi-dev