Ensure current animation is cancelled before building new folder animation. am: 7899902b12 am: 24dcb5b3e1 am: 92d27159b3 am: f643843e27 am: 453241d789

Change-Id: I2aa52b982c8f648d5e75095940d480191d1917dc