Merge "Snap for 5652667 from 35becf2957c22cddbb318b56e2fc440bfd85d057 to qt-qpr1-release" into qt-qpr1-release