Merge "Only show settings icon for set up users" into pi-dev