Merge "Fix text rendering" into jb-mr2-dev