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