am d1710fbb: Merge "Fixing folder order persistence (issue 6176721)" into jb-dev

* commit 'd1710fbb4053f80103b740c8b393b6cb4a480d6f':
  Fixing folder order persistence (issue 6176721)