Merge "Update animation helper class to most recent version"