Merge "Update process state after unbinding a service." into oc-dev