Merge "Fix UI issues (trace collection config)"