Merge "Reduce animation completion epsilon to avoid early end." into sc-dev