media fixes for v4.10-rc6