am df871fe8: Merge "Cleaning up animation code"

* commit 'df871fe8d988b384bba8d60c65b50fda260591f3':
  Cleaning up animation code