Revert "Revert "S60570: Boards/grids do not remove invalid items on object updates""

This reverts commit 4799db7c2f1470c023b66cac7cb48dd39b6fa90d.