Snap for 5096429 from 5ff4631e47d6a8a56f928916c0530f2147b274b0 to qt-release

Change-Id: Id9bcfd96ee73e2eaee802535fc0a500c422bf5bb