Merge "Fix intermediate height in convolve_c"