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

Change-Id: I49b75a674854a97fc5deeb0bfec1666c68f81d72