Merge changes from topic "am-a3d615af-02aa-451c-b89c-c1f59300b566" into ub-launcher3-master

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