Merge "Revert "Settings for skip and silence gestures""