Merge "Making folders open/close smoothly" into jb-dev