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

* commit '78a4b7993b95d0f0270a0bb0ce58355fe5963e97':
  Making folders open/close smoothly