Merge "Purify SettingsActivity from old search code."