Merge branches 'video' and 'video-edid' into release