Merge "Revert "Revert "Add setting for touch gesture and long-press hom..."" into sc-dev