Merge "enable dc error-diffusion always"