Merge "Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592 am: c20c5a5d am: c0a28711" into rvc-qpr-dev-plus-aosp