Merge "Ensure glActiveTexture is cleaned up correctly on functor resume"