Merge "Snap for 5652689 from 15dcadb18cdefb35bf05dc87845713111fb4ffe7 to qt-c2f2-release" into qt-c2f2-release