Merge "Cancel animation before destroying of SurfaceControl." into rvc-dev