Merge "Adds new build target for multi_user trace config for instr_metric test suite perf module migration" into main