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

Change-Id: I30fb4bcc6fd878a92d8f9901daedd2e27254b572