Merge "Fix flaky test" into qt-r1-dev