Merge "Add user icon to the other user preferences." into oc-dev
am: b1c336de5f

Change-Id: Icce728807ace666984af3a93ef495c448cdb9e7b