Merge "Handle undefined NAL type for h264 streaming"