Merge "[XTS] running P2P with Wifi disconnect" into udc-dev