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

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