Ensure current animation is cancelled before building new folder animation. am: 7899902b12

Change-Id: I614bce501ec21844814d262b17f17c53188fffc7