Merge "P2PSetting:Avoid p2p_find on group removal event"