Merge "Fix flaky tests" into qt-dev