Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev