Add extra frame for animation
Fix extra flapping bug
Merge branch 'feature/animation_fixes' into develop