Merge "Fix NPE when KeyChain binding dies"