Merge "Trace list view items management"