Snap for 5663820 from 7d4312596428e2a629da73f5a5524a6eda9da8db to qt-release

Change-Id: I0b4ac3d820a504991c8f771dd5fc9cb7cb20371b