Merge "Clean-up settings slices" into pi-dev