Merge "Add a missing wifi p2p discovery changed broadcast"