Merge "Fix state dumping when service stopped" into sc-dev