Merge "Correct sub-hairline tessellation threshold" into jb-mr2-dev