Merge "Pull up mFlags and isFastTrack from Track to TrackBase"