Merge "Only override the anonymousIdentity when have new one after connection" into main