Merge "EGL: Disconnect native window in eglDestroySurface" into nyc-dev