Merge "Fix deadlock in reportMeasurement() and stop()" into sc-dev