Merge "Deprecate put and return error in ILegacyKeystore" into main