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

Change-Id: I9d9615e15a72c5efa41aca65bc262df81a604609