[automerger] Fix bug where scroll position jumps when in overscroll. am: 5918662f32

Change-Id: I7ed176dfac931c093f41c6325b53f832f049012b