Merge "Captive portal: rotate fallback urls" into oc-dev