Fix some places where we could abort an already-requested transition

This can leave the player in a confused state since the contract
is that, once we send a request, then we will send a corresponding
ready.

Bug: 270228517
Test: Just moved code around a little, so existing tests should pass.
Change-Id: I6871befadc2603029af6402f4cb4d4b2ac55f8b8