Merge "Use a UNIX timestamp in the LoggedOut cookie"