Merge "Fix missing finish callback to fix running animation leak" into rvc-dev