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

Change-Id: Iecc221a907757ff607b0133cd0bf21223023d416