Merge "Reset GL buffer state after functor invocation" into jb-mr1-dev