am 6270f6f9: Merge "Improve OpenGL test reliability" into jb-dev

* commit '6270f6f9cfbf115a923e524d5f4e37a27a08e01f':
  Improve OpenGL test reliability