Merge "Add StateTracker."