Merge "Efficiently reset null user tokens"