Merge "Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)"