Merge "p2p: Display P2P peer MAC address if device name is empty." into cm-11.0
(cherry picked from commit bfad6e62a839ac2c7859da385412d1489602e969)
Merge "Show confirmation for deleted screenshot." into cm-11.0

(cherry picked from commit d12208a3d6e5afd0f2218c8a90edd9460cf8bf77)

Conflicts:
	packages/SystemUI/res/values/cm_strings.xml