Merge "Code cleanup in FontRenderer" into jb-mr1-dev