Merge "Trellis based adaptive quantization" into nextgenv2