Merge "Better touch rects"