Add fixes from bug 975831 with last scroll fixes.