Merge "Allow WiFi picker to exit after a valid connection is made" into jb-dev