state: stop watchers if state.newState fails
Merge pull request #485 from axw/state-newstate-stopwatchers

state: stop watchers if state.newState fails

Came across this bug while trying to make the
tests more reliable.