Merge "Remove search and help menu items from toolbar" into sc-dev