Merge "Add debug markers to OpenGLRenderer"