[HotFix] Keep the visual and data order of listboxitems in sync
Merge pull request #546 from Wahib/bug-fix-180

[HotFix] Keep the visual and data order of listboxitems in sync