Merge "Use correct TLS codepath in graphics libraries"