Merge "Fixing FBO font rendering bug that resulted from using old surface size."