Merge "Modify EGL to disconnect the window when the surface gets destroyed."