Merge "Dither HDR content when compositing to an 8-bit target" into tm-dev