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

Change-Id: I5d8d6be7f32cd373086e6953130795f27b960411