Merge "Make P2P Settings channel static"