Merge "fix flaky opengl test" into jb-dev