Merge "Make CollectTracesComponent more responsive"