Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...