Merge "Include offscreen layers in generated trace" into main