Merge "Fix bug where folder open animation gets finished early" into jb-mr2-dev