Merge "Unbind from KeyChainService before RPCing to keystore"