Merge "Add intent category for slices to help identify them" into pi-dev