Merge changes from topic "am-2cbb68cf-7e12-4b4c-8918-2985468d04c3" into ub-launcher3-master

* changes:
  [automerger] Increase REORDER_TIMEOUT to make it easier for users to create/add to folder. am: 217f0ca2d9
  Increase REORDER_TIMEOUT to make it easier for users to create/add to folder.