Merge "Pull traced files from device for easier debugging" into main