Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev