Issue #2787135 by drpal, xjm, swentel, cashwilliams: Editing mode gets "stuck" after switching between configuration of different blocks