Merge "Exit touch mode on mouse/stylus click"