Merge "Fix off-by-one error in scroll capture page limit check"