Merge "Simplify RecordTrack::stop()"