Merge "Remove code related to stolen trace sessions" into main