fix #2749: ensure that item has not changed before redrawing
Merge branch 'issue-2749' into upstream