Merge "Fix flaky test." into qt-dev