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

Change-Id: I2032cc5ba64c43f0fedbc8e6800e52a539ac140d