When deleting items, ensure the current is updated correctly.

Change-Id: I27734f4ebfaae2d9f3e9e23c4ca88ce8e1a044c1
Merge topic '14198_easy_add_contour_values' into next

a26ce86 When deleting items, ensure the current is updated correctly.