Merge "connect/disconnect is now called from our EGL wrapper"