Merge "egl: recover from failed eglMakeCurrent" into oc-dev