Merge "Fix NPE in onTouchEvent again" into mnc-dev