Merge "Expose captive portal urls for configuration" into qt-dev