Merge "wifi-display: set display to unavailable if p2p device is unavailable"