Merge "Snap for 5652708 from a66bfb90b62fba137c102390ef9f43957ec84439 to qt-release" into qt-release