Merge "Fix NPE in InsertionPointCursorController.onTouchEvent"