Merge "Rename old StateTracker"