Merge "Ignore EGL_BAD_CURRENT_SURFACE errors from eglSwapBuffers"