Ensure current animation is cancelled before building new folder animation. am: 7899902b12 am: 24dcb5b3e1 am: d7c8a8dd89 am: d5e51142a9 am: b593377e55

Change-Id: I3f132cb89e02cb573c527a543c3994e9515e639a