Merge "const correctness, validPixel test."