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

Change-Id: Ib03f0696b0f5c45d1d7f140c0a97d03beedff6a0
2 files changed