Merge "Add RenderEngine trace point with layer name." into sc-dev