Upd: Refactor of state transitions (cont.)

States that immediately transition on the next frame, and have a linear
flow (single next state) now handled in GameState.

Branching states are being left in main because their conditions rely on
UI elements, which the game sub-pakage should not see.