Merge "Handle state transition for p2p enable reject"