Merge "Less false positives for MEDIATYPE_VIDEO"