Merge pulseaudio pending patching from #3360