Merge "profcollect: Move trace providers to a subdirectory" into main