am 018c33ce: am b84ace51: Merge "Fixed a crash where onTouch might have been...
am 018c33ce: am b84ace51: Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev
* commit '018c33ce':
Fixed a crash where onTouch might have been called too early