Merge "EGL: Ensure surfaces are disconnected when destroyed" into nyc-dev