Merge "Update CookieManager documentation"