Merge "Keystore 2.0: Reduce sqlite cache to 0.5M"