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