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

* commit '29a0390b33d2fb6b1e610d5ab2fd2dc0c199d699':
  Fix bug where folder open animation gets finished early