Merge "Remove unused test debug tracing" into main