Merge "wifi-display: fixes for PAUSE/PLAY state"