am d56554e8: am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"

* commit 'd56554e82b591357cbb819859ddcc7b87ff7306b':
  animateNoDamage failed to remove from current frame list