media fixes for v4.9-rc4