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