Merge "Snap for 5652499 from a8cc8427259c5475643912ebc884f72e9db9bed7 to qt-release" into qt-release