Merge "[SurfaceFlinger] Extend HDR support." into pi-dev