Add stopping state for more state granularity (OMS-557)