m7-common: enable wfd, wifi p2p

Change-Id: I8d95ce5cd9a090385844d6dfea38b8505fbc2fca
m7-common: DeviceSettings: don't enable logo2menu by default

Change-Id: Ic282300d78a07b27e881c6dc50ac72a350c72f1f
Merge "m7-common: enable wfd, wifi p2p" into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1