Merge "Use enum track_state consistently"