Snap for 5096429 from da027992ffda18c587d83d3e6a7a4e9b9386814c to qt-release

Change-Id: I897cc6aec9a2f3447816d2e9b16a25bf9a261aef