Merge "GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT"