Merge "egl: handle failed eglMakeCurrent EGL_NO_CONTEXT" into oc-dev