Merge "Rename TrackBase::mFrameCount to mStepCount"