[automerger] Fix bug where add to folder fails even when folder creation animation runs. am: 36f6359c21

Change-Id: I2bfde2d4c4ef6030a9545d50afa379734b1346d9