am 1361dff5: Merge "Support 3D rotations when drawing text" into jb-mr2-dev

* commit '1361dff5eb54b9b02b4d1a2d3e2ed3afd216d79d':
  Support 3D rotations when drawing text