Merge "Fix missing finish callback to fix running animation leak" into rvc-dev am: 526632d15f am: d49d6f502c

Change-Id: I915a2c072e7f0638d2d81d737bd34c222c2d03f2