Merge "Catch IllegalStateException during KeyChain binding" into main