Merge "Added trackName as additional argument to WRITE_MSG to handle trace messages with a track name"