Fix bug where item was not moved in database when added to a Folder.
am: 4e54a4cfa5

Change-Id: I861abced20e4feb0d222997249c774e324124cef