Merge "Fix bug in split touches." into gingerbread