Merge "Recalculate zbin_extra only if regular quantizer is being used"