Merge "Finish unfold transition after timeout" into main