Merge "Snap for 5652667 from 4139744db0a1c14bf22982e5e8e0288ce334e046 to qt-qpr1-release" into qt-qpr1-release