Merge "Add plumbing from settings to gesture properties"