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