Snap for 5096429 from 8aee4d1c1c3bb2f22e29d1e6a31e890984cd20bf to qt-release

Change-Id: I9edafc9452049b845d8e4e6b00159822bd42c363