Apply fix from bug 949132
Remove UpdateScrollOffset completely