Merge changes Id5d858d2,I901d1486

* changes:
  Tidy up GL resources
  Moving RenderEngineTest to Value-parameterized tests