Merge "Merge "Fix missing finish callback to fix running animation leak" into rvc-dev am: 526632d1 am: e7456ea6" into rvc-d1-dev-plus-aosp