Merge "[SurfaceFlinger] Fix HDR tone mapping." into pi-dev