Merge "Update CTS for removal of dither from default Paint" into sc-dev