Merge "Resume the behavior when delete a disconnected P2P" into udc-dev