Merge "Fix bug 5199326 - ListView's fast scroller is out of sync with contents"