Merge "Revert^2 "Enable new touchpad stack by default""