Merge "Return new authenticatorId when invalidation finishes"