Merge "[WifiSettings] Refactor Wi-Fi required info"