Merge "Continue cleanup refactoring in OpenGLRenderer."