Merge "Don't swallow eglCreateContext errors" into klp-dev