Trying to resolve default search setting for Concierge ViewController. Did not resolve yet.
Merge branch 'Marion'
merging to my branch