Merge "Add test for clipped convolve and color matrix." into lmp-dev