Pick-to: dev Task-number: QTQAINFRA-4889 Change-Id: Iae783e66a3f4b1421993c5db746bd44a1ef81dd4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>