fix(core): prevent cross-type content block merging in merge_lists
#35984
+31
−0
merge_lists
#35984