Merge "Cancel animation before destroying of SurfaceControl." into rvc-dev am: 3ee0b75a am: 778c9323 Change-Id: I361ae197e5982e4aa0c19a9f2c819987c27369d0