Merge "Remove obsolete TrackBase::reset()"