Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb