Merge "Fix StateMachine init/quit race."