Merge "Fix yuv too strict bug: 21037163" into mnc-dev