Merge "Supply extra brightness parameters to RenderEngine"