Merge "enable trellis quantization for 2nd order blocks"