Merge "Revert "Finish animation callback set latest value"" into main