Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev