Merge "Avoid multiple font cache texture uploads Bug #8378964" into jb-mr2-dev