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

Change-Id: I47c2f9f106f518041283c0808914df1976f11599