Merge "Improve Wi-Fi Settings UI in guest mode"