Merge "Snap for 5652534 from b365706b2675fcc16eb14d89db5c3736170c7dd5 to qt-release" into qt-release