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

* commit 'e83b8acab104866637c82f02f53e0c8fe492b410':
  Minor fixes to stop crashing on panning/dragging on phones.