Merge change 2465 into donut

* changes:
  Fix crash in GestureOverlayView