Merge "P2p UI fixes"