Merge "Simplify cookie usage in allowlist token serialization" into main