Merge "Fix EGLImage memory leak"