Merge changes from topics "invert-some-inputconfig", "rm-touch-modal"

* changes:
  Remove the concept of TOUCH_MODAL from input
  Invert some InputConfig flags to simplify default behavior