Merge "Fix DynamicLayout block index calculation after edit"