Merge "Merge "Cancel animation before destroying of SurfaceControl." into rvc-dev am: 3ee0b75a am: 344d4134" into rvc-d1-dev-plus-aosp