Merge "Fix Wi-Fi setup in setup wizard"