Fix parent TrackActivity
Merge remote-tracking branch 'origin/new_origin' into new_origin