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

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