am 4045eb73: Fixing folder order persistence, issue 5422712

* commit '4045eb736e76374ec8b53b4cea2eaea47c72db4a':
  Fixing folder order persistence, issue 5422712