Added more state change events to propperly transition.
Merge branch 'test' into dev