Merge "Change name of search menu item to be more descriptive" into mnc-dev