Merge "Remove KeyStore#state()" into main