Merge "Fix bug - SSID field not cleared after disconnect"