Merge "Fixes regression caused by ag/9259064" into qt-qpr1-dev