Merge "Minor fixes to stop crashing on panning/dragging on phones." into honeycomb