Merge "Fix merging transitively-connected change queues."