Fixing a keystore state issue on encryption key change

In the generated key store case, I moved the ultimate setting of the `_keyStoreKey` property to the end of the setter, to reflect the passcode key store case.  For the passcode key store case, the dictionary was getting re-encrypted with the wrong key.  Both use the same pattern (and proper key) now.