Include scrollerCutOff when computing scroll height

Closes #2321