Merge "Use hasSystemFeature() to check for p2p"