Merge "Snap for 5652667 from 2c985751f6e7f8d38d20cd59bdd5fda1ba675cab to qt-qpr1-release" into qt-qpr1-release