Reuse leaf annotations only for new leaf annotations (i.e. don't assign a cluster to a leaf annotation and vise versa)

Signed-off-by: Or Sharir <or@sharir.org>