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

* commit '33ca87b792259929b371b39c7a6b8dd758fa67d6':
  Fix NPE in onTouchEvent again