Merge "display: Move gpu tonemapper out of headless."