Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev