Merge "Cancel animation before destroying of SurfaceControl." into rvc-dev am: 3ee0b75a am: 344d4134 Change-Id: Ifd21632b83d351a1efb460aec12829ba1bf29c14