Merge "snapuserd: Fix merging of overlapping copy blocks"