Merge "2/n: Save new authenticatorId in invalidationClient"