Fixing folder order persistence, issue 5422712

Change-Id: I72d99274b581a803f01042e1de979c59faa4684b
1 file changed