Merge "gpu_tonemapper: Adjust sample points to maintain linearity"