Merge "Disable flaky tests" into qt-dev