Snap for 5096429 from e194d8a869d5a9426ed20ca14242799a993e7635 to qt-release

Change-Id: I5dbcd35b7a0f8ca0823fa83a52f47e12cf3f862f