Merge "Add setupwizard personalisation state to Settings" into pi-dev