Merge "Add notification when p2p is enabled"