Merge "Keystore 2.0: Fix deadlock situation."