Don\'t let folder be replaced with final item twice.
am: 1a690cb785

* commit '1a690cb785a1b1644ad4c97e8b755528b2222cfc':
  Don't let folder be replaced with final item twice.