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