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