Merge "Handle timeout/state-change during fold animation" into main