Merge "Only scroll on screen when necessary." into honeycomb