Merge "Do not clear scores during stopTracking." into oc-dr1-dev