Merge "Increase REORDER_TIMEOUT to make it easier for users to create/add to folder." into ub-launcher3-edmonton