Merge "Fallback if redirect url is not valid for captive portal login" into rvc-dev