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

Change-Id: I222b6985aaeceb8fb74eb52c728bfce9fb2ff554