Merge "Do not turn on dithering by default" into sc-dev