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

Change-Id: I7a3bbaf9d8f5abc036ed90ef13f35bbb4fd6b391