Merge "Use both mouse and touchpad sources for touchpads"