Merge "Use a quantizer-based threshold rather than full search for deringing" into nextgenv2