Merge "Snap for 5652499 from 78da533b3e7efea8f020562a7ac5b1a64c2d11c5 to qt-release" into qt-release