Merge "Snap for 5652667 from 8e69cf7168caef86d66aa663c2e303c73a8d77ab to qt-qpr1-release" into qt-qpr1-release