Merge "Fixes a missing highbitdepth convolve call bug"