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