Merge "Always call stopMeasurementCollection before startMeasurementCollection" into tm-qpr-dev