Merge "Fix keystore2 crash counting"