Merge "Handle assertion error while binding to keychain" into main