Issue #2925436 by fenstrat, acbramley: Reordering multi valued block fields mixes up block id and settings for moved items once entity is saved