am 19886f8b: Merge "Properly scale text" into jb-mr2-dev

* commit '19886f8b5109218191908d2ce5faf0293f85cf31':
  Properly scale text