VE-696: Fix jumping to top of screen

This was fixed today in core: https://gerrit.wikimedia.org/r/#/c/100490/ 

I pulled the changes in manually.

@inez