Merge "Snap for 5652499 from 18eccd076ff5352f230bcec09536befd27d748a5 to qt-release" into qt-release