Merge "Support 3D rotations when drawing text" into jb-mr2-dev