Merge "Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592 am: c7336cdf" into rvc-d1-dev-plus-aosp