Bug 960790: Fix P2P presence discovery handling. r=allstars.chh