Merge "Improve OpenGL test reliability" into jb-dev