Merge "Fix a race when persisting cookie data"