Merge "Fix another memory leak in OpenGLRenderer"