Backported [688d48fe] and [68a19d04]

Due to VLC's API changes, no cherry-picks were possible for these commits