Merge "Fixes string reference in SEARCH_INDEX_DATA_PROVIDER and minor changes to UI based on UX review."