Merge "add changes to make the add user button up to spec" into pi-dev am: 5b510f5c7b
am: 7d01142c89

Change-Id: Ia583bf18a9815ab40d3e64403e264de18d587694