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

Change-Id: I78d81f03d804afa9fc8ee21347fc1980b6bdd6b9