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

Change-Id: Idd6fbd7415316ffe8e6641ec2becb99c6d48329d