Merge "Add setting for touch gesture and long-press home assistant invocations" into sc-dev