Merge "Fix HitTest type detection"