Merge "Use WifiEntry info to decide whether to ask for password" into main