Merge "Refactor WiFi code around XL setup"