Merge "Keystore2: Delete all super keys." into sc-v2-dev