Merge "profcollect: Disable tracing while ADB is connected" into main