[vlc/f37] (18 commits) ...Drop merged patch