Merge "Fix flaky UdpEncapsulationSocket test" into qt-dev