Return underlying state when in `OFFLINE` and `SYNCING`

[pm47]

There is an ambiguity because the state is sometimes really a combination of state + data.

We should probably return OFFLINE_X, SYNCING_X, with X=WAIT_FOR_FUNDING_CONFIRMED, NORMAL, etc.

[t-bast]

We tried this in #2225 but it created more problems than it solved...shall we keep that issue or is this a dead-end?

[t-bast]

Closing for now, we can re-open later if we feel it's necessary.