Merge "Add plumbing for touchpad settings"