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