Merge "Add settings for visual query accessibility" into main