Snap for 5096429 from d876984ef90559f75d6d8c06b4f8f772d4c6eb4c to qt-release

Change-Id: Ie8baedd8bd895173cc2dc559ef178c6a8a489eab