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

* commit '9fdf3868aa4f1fdc7295759e24a0c7498ee98c60':
  Fix bug where folder open animation gets finished early