Merge "Add Settings Search Regression test"