am 9631f6ff: am 33ca87b7: Merge "Fix NPE in onTouchEvent again" into mnc-dev

* commit '9631f6ffdd51e66e982907f7ddef4fffb0fda74c':
  Fix NPE in onTouchEvent again