Merge "Let CategorySelectorFragment and IndividualPickerFragment can have their own tool bar." into sc-dev