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

Change-Id: I8afccc13e384a2c1fde39b291e1b8d84c980d36e