Merge "LayerTraceGenerator: Provide a large enough buffer to generate layer trace"