Merge "Cherry-pick one upstream patch" into qt-dev