Revert^2 "Handle timeout/state-change during fold animation"

This reverts commit 9ec8f8ef9c505919e7d9e0e0f2d928d196bd82d2.

Reason for revert: landing back the changes with a fix

Change-Id: I59c57cbc1e4fc3732bb7e04add2bab32d428c798
1 file changed