Merge "Fix SurfaceControl leakage"