am c8a69fb6: Merge "Sort folders according to their hierarchy." into jb-ub-mail-ur10

* commit 'c8a69fb6fb60297e078f70789f8d49fc0d70662e':
  Sort folders according to their hierarchy.