Merge "Clean left over data migration after removal of TrackingIds table"