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

Change-Id: I2d43eec203611cb6df9e0b039c485be7a0c04407