Merge "Don't crash if KeyChain can't be bound to." into nyc-dev