!1710 (merged) was based on the premise that touch-mode (i.e. auto-rotation and onscreen keyboard availability) should never be enabled when a device has a touchpad currently enabled. This would be a good assumption if all 2-in-1 laptops correctly disabled their touchpads when folded into tablet mode. But many don't, unless they are listed on a per-device basis in the Linux kernel.
Adding a gsetting would probably be the ideal solution here, but I think a reversion is the best option in the short term, since the issue has been unsolved for months and has been mentioned in multiple places: