Merge "Treat disconnected P2P as opportunistic after timeout" into udc-dev