Merge pull request #4954 from SiliconLabs/backport_4878

Backport 2.x: Remove dependency of built-in keys on storage