In a later diff I'll introduce a new variant for this, and with the new variant I figured the term "variant" made more sense than "state" (it's no longer specific to loading state).

Depends on D7724

Flow