Minor fixes to stop crashing on panning/dragging on phones.

Change-Id: Ibfc0072d6db039b97876702b2c0577359a7ae567
2 files changed