Merge "Camera: update tonemap curve images" into pi-dev