Merge "Fix issues with U8->U8 when mixed with add or lane conversion" into klp-dev