Merge "Add remaining tone mapping support in Skia-RenderEngine"