Merge "Rename settings category." into pi-dev