Merge "Add more slices to settings" into pi-dev