Merge "cap the best quantizer for 2nd order DC"