[vlc] Clean merged patch, disable wayland runtime detection revert