Merge "Optimize text GL setup" into jb-mr2-dev