Merge "Add removeState method to StateMachine"