P2P: Fix remain-on-channel abort race