Merge "Fix a GL error leak issue"