Merge "Reduce number of glDraw calls when drawing text" into jb-mr2-dev