Merge "[automerger skipped] Merge "Expose captive portal urls for configuration" into qt-dev am: e0603420f8 -s ours am: 0370f2f59f -s ours am skip reason: change_id I54050b28bbfb93e0b7e509dbe0e987a0b902b7d9 with SHA1 8beec384fd is in history"