Merge "Modifying user switcher per design (issue 7047393)" into jb-mr1-dev