Merge "SpriteController: Reparent SurfaceControls to null before disposing"