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