Merge "composer: Fix TUI state during unprepare"