Merge "KeyStorage: rework key upgrade handling"