Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb