am 7afa902b: Fix issue where item gets added to folder when displacing folder (issue 6576460)

* commit '7afa902b6cf1b63aa145ec95bc62757b4f680abd':
  Fix issue where item gets added to folder when displacing folder (issue 6576460)