Merge "Cleanup of FontRenderer"