Merge "Keystore 2.0: Fix racy super key management."