Merge changes from topic 'am-4864e8c3-e581-4e7f-bc1f-7276c1bf7352' into ub-launcher3-master

* changes:
  [automerger] Fix bug where user gets stuck in overscroll. am: 27ad267a81 am: 572da280d3
  [automerger] Fix bug where user gets stuck in overscroll. am: 27ad267a81
  Fix bug where user gets stuck in overscroll.