fix(threads): a merged PR settles its thread only once (#7454)