Merge "Disconnect from surface when the RenderSurface object is removed." into qt-dev