Merge "Fix the group null issue when there is no p2p group created" into udc-dev