media fixes for v4.20-rc8