Merge "Snap for 5652499 from 815b53bcc19c9134dfe1726be08a19cccfa9badc to qt-release" into qt-release