Merge "Snap for 5652689 from 4139744db0a1c14bf22982e5e8e0288ce334e046 to qt-c2f2-release" into qt-c2f2-release