isci: merge remote_device substates into a single state machine