am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev

* commit '3a762d8bfbe6b2d4066bc5cc90301063c19976c4':
  Fix text rendering