Merge "Send a zero for assist invocation on animation end" into sc-dev