Merge changes from topic "am-49ab0b6a-0408-47fb-8ced-f83558d65fe3" into ub-launcher3-master

* changes:
  [automerger] Make fling thresholds consistent am: 0f640b6c1b
  Make fling thresholds consistent