Merge "Fix getting InputMethod from motionEvent on the click listener to get the actual input method." into main