Merge "Fix captive portal can't show certificate problem" into qt-dev