Merge changes from topic "am-4b8e4c1e-4bcf-4005-a8fa-209b8b48e653" into ub-launcher3-master

* changes:
  [automerger] Accounting for one frame jump when starting a fling animation am: 9c3f172d9c am: 4205b54ca8
  [automerger] Accounting for one frame jump when starting a fling animation am: 9c3f172d9c
  Accounting for one frame jump when starting a fling animation