Merge "profcollectd: Use system property to probe etr when needed" into main