Work around scroller bugs

Work around b/17700698 and b/17704016 in order to improve
the performance of nested scrolling. When either of these
bugs are fixed, we can revert most of this CL.

Bug: 16462679
Change-Id: I07755d2aa4c080d2f906fe2b8dd2d7a00636eb42