Merge "media: ignore null InputStream"