Merge "fix stroke sub-hairline threshold" into jb-mr1-dev