Merge "Revert hiding user 0 in user picker/switcher." into pi-dev
am: 9e1024fb6b

Change-Id: I06b474d6a0a6b143fd453fea90d6aca8c7e1b3c7