Cleanup to TracksDefault and Tracks_TrackStore.
Merge remote-tracking branch 'origin/master'