Merge "[Unfold transition] Ensure that we start fold animation after half-folded state" into main