Merge "Avoid launching Wi-Fi details settings if WifiEntry key is lost" into main