Merge "Add username beside user switch." into oc-mr1-dev am: 42aed466ae
am: de5560ccf1

Change-Id: I785c6e61c220c4dc7adc4b6b01540414f4b60c04