am aa479a56: am 02d1863c: Merge "Making folders work in RTL (issue 8569879)" into jb-mr2-dev

* commit 'aa479a56c3f521865d6ca7e79f8c5e7a4042de7b':
  Making folders work in RTL (issue 8569879)