Merge changes I3dc2590f,I59c57cbc into 24D1-dev

* changes:
  Ensure that fold overlay is removed after playing animation
  Revert^2 "Handle timeout/state-change during fold animation"