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

Change-Id: I5437e02a5c16eefd05c3414c98f77b96bfb0b2ca