Taylor Swift’s music returns to TikTok after Universal Music agrees new licensing deal, ending spat