Merge "Fix partial reset function in StateTracker"