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

Change-Id: I9cd5842bcb562d67f1d106566ff9102dc18d11b1