Merge pull request #17426 from apache/fix-subpixel