Fix issue where items could not be moved back 
to their original positions

This also fixes crash 3038168

Change-Id: I4142a1fe32954e76e6ab02ea09f50d4bdefec67c
2 files changed