Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-dev