Merge "EGL: move disconnect to surface dtor"