am 4b0cebb4: Reconcile with jb-mr2-release - do not merge

* commit '4b0cebb4939aa4431f8d0c607db3a8f3424e2a84':
  Fix bug where folder open animation gets finished early