Merge "Making folders work in RTL (issue 8569879)" into jb-mr2-dev