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

Change-Id: I29756479d37f6b0fa4886f8909572e59926599a5