Merge "Move frame count calculations for fast tracks"