am 6f8e526e: am 78a4b799: Merge "Making folders open/close smoothly" into jb-dev

* commit '6f8e526e2818e4ceb39cede79abcf2d48cfc4c8f':
  Making folders open/close smoothly