Merge "DO NOT MERGE: Deleted SurfaceControl.remove method" into qt-r1-bubbles-dev