Merge "Small code cleanup in FontRenderer" into jb-mr1-dev