Merge "Make fling thresholds consistent" into ub-launcher3-edmonton