media fixes for v5.12-rc3