Merge "Fix native resource leak when OpenGL renderer is not being used."