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

Change-Id: Ieca2d72cf50cb96ef5f810a1caf2b7c7079c7d15