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

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