Merge "Remove isDither(), deprecate setDither()" into mnc-dev