media fixes for v5.10-rc8