Merge "Fix bug 5073637 - Market apps crashing FastScroller"