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

Change-Id: Iee896520f50f84bdb46bb28436e2bbad816c1055