Merge "Add optional feedback button for settings search"