media fixes for v4.16-rc7