Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev