am 3ef849c6: Merge "Make sure we don\'t create and drop orphans when sorting folders by hierarchy" into jb-ub-mail-ur10

* commit '3ef849c6836a579d42117d333de7c4ecd67d8f16':
  Make sure we don't create and drop orphans when sorting folders by hierarchy