Merge "Captive portal: rotate fallback urls"