Merge "SearchView asset changes."