Merge "Add settings for the assist gesture."