Merge "p2p: Display P2P peer MAC address if device name is empty." into cm-11.0
Merge "Show confirmation for deleted screenshot." into cm-11.0