Tweak animation to not roll 0 -> 1, overflow hidden (#5148)

Tweak animation to not roll 0 -> 1, overflow hidden (#5148) #2849