Merge "Add username beside user switch." into oc-mr1-dev