Merge "Fix a race in persisting instant cookie"