Merge "Fix EGLImage memory leak" into nyc-mr1-dev