Merge "Disable Wifi when a user press cancel in XL setup"