Merge "Snap for 5652689 from a24cefa598987f591e50f50cc5711c3ac677425d to qt-c2f2-release" into qt-c2f2-release