Merge "P2P: Fix ApSta auth/death with null p2p_dev_add" into oc-dev