Merge "Update activities to clear search term when a root that doesn't support search is selected by the user."