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

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