Merge "egl: handle failed eglMakeCurrent EGL_NO_CONTEXT" into oc-dev am: 2153f5e317
am: 0e00045ef4

Change-Id: I337051b245c5969a7611bfb5c2f07dc4aac5abbc