Merge "Fix scrolling when the bound target offset is too high"