Merge "Detach thread so stop_measurement doesn't block" into sc-dev